remove babl-fish-stats

diff --git a/TODO b/TODO
index 1c5aefcbe9a358aa2ff667627035e6e92b9e482f..6707b941b8341757ca76d869d5659e69ac72c5d2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,11 +3,8 @@
 <ul>
   <li>Support for conversions between formats that have higher dimensionality than RGBA. (arbitrary meaningless components)</li>
   <li>Support for datatypes that are not a multiple of 8bit.</li>
-  <li>dithering</li>
   <li>dynamic data attached to format, or internal handling of icc through
   a registered set of profiles</li>
-  <li>
-  Stocastic runtime profiling with running average of the peformance for
-  conversions, to avoid problems incurred if other cpu intense is happening
-  when babl tests a conversions. </li>
+  <li>handling of custom RGB primaries and gamma</li>
+  <li>dithering</li>
 </ul>

diff --git a/babl/Makefile.am b/babl/Makefile.am
index 0f5526d62acddbe31d609c8e0999cf0c7f191322..096f6b72099e2e73dae25e9eaabf6cf15a459258 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -17,7 +17,6 @@ c_sources =                           \
        babl-fish-path.c                \
        babl-fish-reference.c           \
        babl-fish-simple.c              \
-       babl-fish-stats.c               \
        babl-fish.c                     \
        babl-format.c                   \
        babl-hash-table.c               \

diff --git a/babl/babl-fish-stats.c b/babl/babl-fish-stats.c
deleted file mode 100644 (file)
index 2b9cc7c..0000000
--- a/babl/babl-fish-stats.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/* babl - dynamically extendable universal pixel fish library.
- * Copyright (C) 2005, Øyvind Kolås.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-#include "babl-internal.h"
-
-static FILE *output_file = NULL;
-static int   qux         = 0;
-
-static char *utf8_bar[] = { " ", "·", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
-/*
-static char *utf8_bar[]=  {"!","▁","▃","▅","▇","█","!","!","!"};
-static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", };
-static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"};
-*/
-
-static double sum_pixels = 0.0;
-
-static int
-table_destination_sum_each (Babl *babl,
-                            void *userdata)
-{
-  const Babl *source      = userdata;
-  const Babl *destination = babl;
-
-  if (source != destination)
-    {
-      const Babl *fish = babl_fish (source, destination);
-      babl_assert (fish);
-      sum_pixels += fish->fish.pixels;
-    }
-  return 0;
-}
-
-static int
-table_source_sum_each (Babl *babl,
-                       void *userdata)
-{
-  babl_format_class_for_each (table_destination_sum_each, babl);
-  return 0;
-}
-
-static void
-table_sum_processings_calc (void)
-{
-  sum_pixels = 0;
-  babl_format_class_for_each (table_source_sum_each, NULL);
-}
-
-#define LIMIT 0.03
-
-static int
-table_destination_each (Babl *babl,
-                        void *userdata)
-{
-  Babl *source      = userdata;
-  Babl *destination = babl;
-
-  qux++;
-  if (qux % babl_formats_count () == qux / babl_formats_count ())
-    fprintf (output_file, "<td class='cell'>&nbsp;</td>");
-  else
-    {
-      const Babl *fish = babl_fish (source, destination);
-
-      babl_assert (fish);
-
-
-      switch (fish->class_type)
-        {
-          case BABL_FISH_PATH:
-
-            fprintf (output_file, "<td class='cell'%s><a href='javascript:o()'>%s",
-                     fish->fish.pixels / sum_pixels > LIMIT ? " style='background-color: #69f'" : "",
-                     utf8_bar[babl_list_size (fish->fish_path.conversion_list)]);
-
-            {
-              int i;
-              fprintf (output_file, "<div class='tooltip'>");
-              fprintf (output_file, "<h3><span class='g'>path</span> %s <span class='g'>to</span> %s</h3>", source->instance.name, destination->instance.name);
-              if (fish->fish.processings > 0)
-                {
-                  fprintf (output_file, "<span class='g'>Processings:</span>%i<br/>", fish->fish.processings);
-                  fprintf (output_file, "<span class='g'>Pixels:</span>%li<br/>", fish->fish.pixels);
-                }
-              fprintf (output_file, "<table>\n");
-
-              fprintf (output_file, "<tr>");
-              fprintf (output_file, "<td><em>conversion</em></td>");
-              fprintf (output_file, "<td style='text-align:right'><em>cost</em></td>");
-              fprintf (output_file, "<td style='text-align:right'><em>error</em></td>");
-              fprintf (output_file, "</tr>");
-
-              for (i = 0; i < babl_list_size (fish->fish_path.conversion_list); i++)
-                {
-                  fprintf (output_file, "<tr>");
-                  fprintf (output_file, "<td>%s</td>", BABL (fish->fish_path.conversion_list->items[i])->instance.name);
-                  fprintf (output_file, "<td class='r'>%li</td>",
-                    babl_conversion_cost (&BABL (fish->fish_path.conversion_list->items[i])->conversion));
-                  fprintf (output_file, "<td class='r'>%e</td>",
-                    babl_conversion_error (&BABL (fish->fish_path.conversion_list->items[i])->conversion));
-                  fprintf (output_file, "</tr>");
-                }
-
-              fprintf (output_file, "<tr>");
-              fprintf (output_file, "<td><em>total</em></td>");
-              fprintf (output_file, "<td class='r'><em>%3.0f</em></td>", fish->fish_path.cost);
-              fprintf (output_file, "<td class='r'><em>%e</em></td>", fish->fish.error);
-              fprintf (output_file, "</tr>");
-              fprintf (output_file, "</table>");
-              fprintf (output_file, "</div>");
-            }
-            fprintf (output_file, "</a></td>\n");
-            break;
-
-          case BABL_FISH_REFERENCE:
-            fprintf (output_file, "<td class='cell'%s><a href='javascript:o()'>&nbsp",
-                     fish->fish.pixels / sum_pixels > LIMIT ? " style='background-color: #f99'" : "");
-            fprintf (output_file, "<div class='tooltip'>");
-            fprintf (output_file, "<h3><span class='g'>Reference</span> %s <span class='g'>to</span> %s</h3>", source->instance.name, destination->instance.name);
-
-            if (fish->fish.processings > 1)
-              {
-                fprintf (output_file, "<span class='g'>Processings:</span>%i<br/>", fish->fish.processings);
-                fprintf (output_file, "<span class='g'>Pixels:</span>%li<br/>", fish->fish.pixels);
-              }
-            fprintf (output_file, "</div>");
-            fprintf (output_file, "</a></td>\n");
-            break;
-
-          case BABL_FISH_SIMPLE:
-            fprintf (output_file, "<td class='cell'%s><a href='javascript:o()'>&middot;",
-                     fish->fish.pixels / sum_pixels > LIMIT ? " style='background-color: #69f'" : "");
-            fprintf (output_file, "<div class='tooltip'>");
-            fprintf (output_file, "<h3><span class='g'>Simple</span> %s <span class='g'>to</span> %s</h3>", source->instance.name, destination->instance.name);
-
-
-            fprintf (output_file, "%s<br/>", BABL (fish->fish_simple.conversion)->instance.name);
-            fprintf (output_file, "<span class='g'>cost:</span> %li<br/>", babl_conversion_cost ((fish->fish_simple.conversion)));
-            fprintf (output_file, "<span class='g'>error:</span> %e<br/>", babl_conversion_error ((fish->fish_simple.conversion)));
-
-            if (fish->fish.processings > 0)
-              {
-                fprintf (output_file, "<span class='g'>Processings:</span>%i<br/>", fish->fish.processings);
-                fprintf (output_file, "<span class='g'>Pixels:</span>%li<br/>", fish->fish.pixels);
-              }
-            fprintf (output_file, "</div>");
-            fprintf (output_file, "</a></td>\n");
-            break;
-
-          default:
-            babl_fatal ("Unknown fish type");
-            break;
-        }
-    }
-  return 0;
-}
-
-static int source_no = 0;
-
-
-
-static int
-table_source_each (Babl *babl,
-                   void *userdata)
-{
-  char        expanded_name[512];
-  const char *s;
-  char       *d;
-
-  s = babl->instance.name;
-  d = &expanded_name[0];
-
-  while (*s)
-    {
-      switch (*s)
-        {
-          case ' ':
-            *(d++) = '&';
-            *(d++) = 'n';
-            *(d++) = 'b';
-            *(d++) = 's';
-            *(d++) = 'p';
-            *(d++) = ';';
-            *(d)   = '\0';
-            s++;
-            break;
-
-          default:
-            *(d++) = *(s++);
-            *(d)   = '\0';
-            break;
-        }
-    }
-
-  fprintf (output_file, "<tr>");
-  fprintf (output_file, "<td class='format_name'><a href='javascript:o();'>%s", expanded_name);
-  {
-    int i;
-
-    fprintf (output_file, "<div class='tooltip' id='format_%p'>", babl);
-    fprintf (output_file, "<h3>%s</h3>", babl->instance.name);
-
-    fprintf (output_file, "<dl>");
-    fprintf (output_file, "<dt>bytes/pixel</dt><dd>%i</dd>", babl->format.bytes_per_pixel);
-    fprintf (output_file, "<dt>model</dt><dd>%s</dd>", BABL (babl->format.model)->instance.name);
-    fprintf (output_file, "<dt>loss</dt><dd>%f</dd>", babl_format_loss (babl));
-    fprintf (output_file, "<dt>planar</dt><dd>%d</dd>", babl->format.planar);
-    fprintf (output_file, "<dt>components</dt><dd><table class='nopad'>");
-
-    for (i = 0; i < babl->format.components; i++)
-      {
-        fprintf (output_file, "<tr><td class='type'>%s</td><td class='component'>%s</td></tr>",
-                 BABL (babl->format.type[i])->instance.name,
-                 BABL (babl->format.component[i])->instance.name);
-      }
-    fprintf (output_file, "</table></dd></dl>");
-
-    fprintf (output_file, "</div>\n");
-  }
-
-  fprintf (output_file, "</a></td>");
-  babl_format_class_for_each (table_destination_each, babl);
-  fprintf (output_file, "</tr>\n");
-  source_no++;
-  return 0;
-}
-
-/* copied from babl-fish-path.c */
-#define BABL_LEGAL_ERROR    0.000001
-static double legal_error (void)
-{
-  static double error = 0.0;
-  const char   *env;
-
-  if (error != 0.0)
-    return error;
-
-  env = getenv ("BABL_TOLERANCE");
-  if (env && env[0] != '\0')
-    error = babl_parse_double (env);
-  else
-    error = BABL_LEGAL_ERROR;
-  return error;
-}
-
-static int
-each_conv (Babl *babl,
-           void *data)
-{
-  double error, cost;
-
-  if (BABL (babl->conversion.source)->class_type != BABL_FORMAT)
-    return 0;
-
-  error = babl_conversion_error (&babl->conversion);
-  cost  = babl_conversion_cost (&babl->conversion);
-
-  if (error > legal_error ())
-    {
-      fprintf (output_file, "<dt style='background-color: #fcc;'>%s</dt>", babl->instance.name);
-      fprintf (output_file, "<dd style='background-color: #fcc;'>");
-    }
-  else
-    {
-      fprintf (output_file, "<dt>%s</dt><dd>", babl->instance.name);
-    }
-  fprintf (output_file, "<em>error:</em> %f <em>cost:</em> %4.0f <em>processings:</em> %i <em>pixels:</em> %li", error, cost,
-           babl->conversion.processings, babl->conversion.pixels);
-  fprintf (output_file, "</dd>");
-
-  return 0;
-}
-
-static void
-conversions (void)
-{
-  fprintf (output_file, "<h2>Conversions</h2><dl>\n");
-  babl_conversion_class_for_each (each_conv, NULL);
-  fprintf (output_file, "</dl>\n");
-}
-
-
-
-void
-babl_fish_stats (FILE *file)
-{
-  output_file = file;
-
-  table_sum_processings_calc ();
-  fprintf (output_file,
-           "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-           "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
-           "<html>\n"
-           "<head>\n"
-           "<title>BablFishPath introspection</title>\n"
-           "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n"
-           "<style type='text/css'>"
-           " body {"
-           "   font-family: sans;"
-           "   margin-left: 1em;"
-           " }"
-           " .cell {"
-           "  overflow : none;"
-           "  height: 1em;"
-           "  font-family: monospace;"
-           "  border: 1px solid #eee;"
-           "  padding: 0;"
-           "  margin : 0;"
-           "}"
-           ".cell>a {"
-           "    text-decoration: none;"
-           "    color: black;"
-           "    cursor: help;"
-           "}"
-           "div.tooltip {"
-           "   border: 0.2em solid black;"
-           "   padding-top: 1em;"
-           "   padding-right: 2em;"
-           "   display: none;"
-           "   padding-left: 2em;"
-           "   padding-bottom: 3em;"
-           "   background-color: white;"
-           "   background-repeat: no-repeat;"
-           "   background-image: url(graphics/babl-48x48.png);"
-           "   background-position: bottom right;"
-           "   color: black;"
-           "}"
-           " .cell>a:hover {"
-           "  background-color: black;"
-           "  color: white;"
-           "}"
-           " .format_name {"
-           "  height: 1em;"
-           "  background-color: #eee;"
-           "  padding-right: 0.5em;"
-           "  padding-left:  0.5em;"
-           "  border-bottom: 1px solid #fff;"
-           "}"
-           " .format_name>a {"
-           "  text-decoration: none;"
-           "  color: blue;"
-           "    cursor: help;"
-           " }"
-           " .format_name>a:hover {"
-           "  background-color: blue;"
-           "  color: white;"
-           " }"
-
-           "a:hover>div.tooltip {"
-           "   display: block;"
-           "   position: fixed;"
-           "   bottom: 0;"
-           "   right: 0;"
-           "}"
-
-           "td.component {"
-           "  background-color: #060;"
-           "  padding-left: 0.5em;"
-           "  padding-top: 0.1em;"
-           "  padding-bottom: 0.1em;"
-           "  overflow: hidden;"
-           "  width: 4em;"
-           "  color: white;"
-           "  border: 1px solid white;"
-           "}"
-           "td.type {"
-           "  background-color: #006;"
-           "  padding-left: 0.5em;"
-           "  padding-top: 0.1em;"
-           "  padding-bottom: 0.1em;"
-           "  overflow: hidden;"
-           "  width: 4em;"
-           "  color: white;"
-           "  border: 1px solid white;"
-           "}"
-           ".g {"
-           "  color: gray;"
-           "}"
-           ".r {"
-           "  text-align: right;"
-           "}"
-
-           "</style>"
-
-           "<script type='text/javascript'>"
-           "var tick_count=0;"
-           "function o ()"
-           "{"
-           "   tick_count++;"
-           "   if (tick_count == 11)"
-           "        alert(\"«The mind is it's own place,\\nand in itself can make a heaven of hell;\\na hell of heaven.»\\n--Milton\");"
-           "   else if (tick_count == 42)"
-           "        alert(\"«So long and thanks for all the fish.»\\n--Adams\");"
-           "}"
-           "</script>"
-
-
-           "</head>\n");
-
-  fprintf (output_file, "<body>\n");
-
-  fprintf (output_file, "<h1>BablFishPath introspection</h1>");
-  fprintf (output_file, "<p>Instrumentation and pathlengths.</p>");
-
-  fprintf (output_file, "<table cellspacing='0'><tr><td>Source format</td><td colspan='32'>Destination formats</td></tr>\n");
-
-  babl_format_class_for_each (table_source_each, NULL);
-
-  fprintf (output_file, "</table>");
-
-  fprintf (output_file, "<div style='height:20em'></div>\n");
-
-  conversions ();
-
-  fprintf (output_file, "</body></html>\n");
-}
-

diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index cde8fc36df5d1bfe4e86acdddafb8530865bb5ab..992a7704d904dfbcd4db0bcb412e27ab1856b392 100644 (file)
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -84,7 +84,6 @@ long     babl_fish_reference_process    (const Babl *babl,
 Babl   * babl_fish_reference            (const Babl     *source,
                                          const Babl     *destination);
 Babl   * babl_fish_simple               (BablConversion *conversion);
-void     babl_fish_stats                (FILE           *file);
 Babl   * babl_fish_path                 (const Babl     *source,
                                          const Babl     *destination);
 

diff --git a/babl/babl.c b/babl/babl.c
index caec6a62dc0a8853a6763fa0a26b8470176e13dc..2b53d68a50327c56cce397ee990c28a9de727122 100644 (file)
--- a/babl/babl.c
+++ b/babl/babl.c
@@ -165,18 +165,6 @@ babl_exit (void)
       babl_store_db ();
 #endif
 
-      if (getenv ("BABL_STATS"))
-        {
-          char  logfile_name[] = "/tmp/babl-stats.html";
-          FILE *logfile;
-          logfile = fopen (logfile_name, "w");
-          if (logfile)
-            {
-              babl_fish_stats (logfile);
-              fclose (logfile);
-            }
-        }
-
       babl_extension_deinit ();
       babl_free (babl_extension_db ());;
       babl_free (babl_fish_db ());;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6e282af51a113fba0aaf7ff42887314bee7ce1ae..f7cf1f713f761baac4227a424a6f9c0e3baf2728 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,7 +42,6 @@ EXTRA_DIST=common.inc
 noinst_PROGRAMS =              \
        introspect              \
        babl_fish_path_fitness  \
-       babl_fish_path_dhtml    \
        babl-html-dump          \
        conversions             \
        formats                 \

diff --git a/tests/babl_fish_path_dhtml.c b/tests/babl_fish_path_dhtml.c
deleted file mode 100644 (file)
index b9bcadf..0000000
--- a/tests/babl_fish_path_dhtml.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "config.h"
-#include <stdlib.h>
-#include "babl-internal.h"
-
-int main (void)
-{
-  babl_init ();
-
-  babl_set_extender (babl_extension_quiet_log ());
-  babl_fish_stats (stdout);
-
-  babl_exit ();
-
-  return 0;
-}